Merge from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:57 +0000 (18:13 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Tue, 9 Aug 2011 22:13:57 +0000 (18:13 -0400)
commit5fb2246ca81d1132d70b02e503e2297b471d64c0
tree568a27155c760ffaf7145c0d5573c225211a8f8e
parent3f3944ac00abb4fd2bb7bff1eb268e5860f85062
parent1b3d531f9c51e73589fdcc92b19468efd712ee66
Merge from emacs-23 branch